Repaint correctly